From b7e08fa93deb49f8dfc22fe1152e824f4f697b29 Mon Sep 17 00:00:00 2001 From: Jehan Date: Tue, 4 Jul 2017 16:44:16 +0200 Subject: [PATCH] babl: clean up various syntax bugs. Trailing whitespaces, tabs, etc. --- babl/Makefile.am | 2 +- babl/babl-extension.c | 2 +- babl/babl-internal.h | 6 +++--- babl/babl.c | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/babl/Makefile.am b/babl/Makefile.am index 096f6b7..9c697a3 100644 --- a/babl/Makefile.am +++ b/babl/Makefile.am @@ -97,7 +97,7 @@ EXTRA_DIST = babl-ref-pixels.inc # already exists because then we are probably working with a tarball # in which case the git-version.h we ship is correct. -libbabl_generated_sources = git-version.h +libbabl_generated_sources = git-version.h BUILT_SOURCES = git-version.h CLEANFILES = git-version.h diff --git a/babl/babl-extension.c b/babl/babl-extension.c index 01efe0f..8edb60d 100644 --- a/babl/babl-extension.c +++ b/babl/babl-extension.c @@ -145,7 +145,7 @@ void babl_extension_deinit (void) #if !defined(BIND_RESTRICTED) # define BIND_RESTRICTED 0 #endif -#define RTLD_NOW (BIND_IMMEDIATE|BIND_NONFATAL|DYNAMIC_PATH) +#define RTLD_NOW (BIND_IMMEDIATE|BIND_NONFATAL|DYNAMIC_PATH) #define HLIB shl_t #define dlopen(path, flags) shl_load (path, flags, 0L) #define dlclose(handle) shl_unload (handle) diff --git a/babl/babl-internal.h b/babl/babl-internal.h index b55249b..78f2b56 100644 --- a/babl/babl-internal.h +++ b/babl/babl-internal.h @@ -143,7 +143,7 @@ real_babl_log (const char *file, va_list varg; va_start (varg, fmt); - real_babl_log_va(file, line, function, fmt, varg); + real_babl_log_va (file, line, function, fmt, varg); va_end (varg); } @@ -167,9 +167,9 @@ real_babl_log (const char *file, #define babl_log(...) \ real_babl_log(__FILE__, __LINE__, G_STRFUNC, __VA_ARGS__) -#define babl_fatal(...) do{ \ +#define babl_fatal(...) do{ \ real_babl_log(__FILE__, __LINE__, G_STRFUNC, __VA_ARGS__); \ - babl_die();} \ + babl_die();} \ while(0) #elif defined(BABL_GNUC_VARIADIC_MACROS) diff --git a/babl/babl.c b/babl/babl.c index 935a860..9924fa7 100644 --- a/babl/babl.c +++ b/babl/babl.c @@ -26,7 +26,8 @@ static HMODULE libbabl_dll = NULL; /* Minimal DllMain that just stores the handle to this DLL */ -BOOL WINAPI /* Avoid silly "no previous prototype" gcc warning */ +/* Avoid silly "no previous prototype" gcc warning */ +BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); -- 2.30.2